Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Thu, 16 May 2013 17:38:40 +0000 (20:38 +0300)
committerEli Zaretskii <eliz@gnu.org>
Thu, 16 May 2013 17:38:40 +0000 (20:38 +0300)
commit1f9962e8094b0842f8eb9aab7a794a56d1646852
tree31aeed75ed8d588ea23095e91f4b3b65018111b8
parent67a41355b3bdc0f196a5587f804f316594f6eb62
parent42a4277c71e766e671d1468bd01768a23b400f01
Merge from trunk.